Simplify motion's counter_cache mechanism
Make counter cache migration less insane