Moving various things out of contrib.common into the root of contentious, as they're part of the core.  BACKWARDS INCOMPATIBLE.
Removing a test which (until the previous commit) was never being run.  And appears to be testing code which never ever existed.
Updating TODO list.