Significant rewrite of move initialization.
Significant refactoring/cleanup.