Cleanup Move

Remove the excess values in the literals.
For some reason there is now a CTFE error (version 2.062) due to
the assignment on line 98. There wasn't a problem before.
I am guessing it is a regression in the compiler but not interesting
in hunting it down right now.
refactor part 1
refactor part 2
refactor part 3
refactor part 4