Implementing affinity and anti-affinity has been a big chunk of work, with a lot of follow-ups. This issue tracks those follow-ups. Feel free to extend.