Disabled parse_affinity_options until it compiles again
Attempt to unbreak move semantics regression tests