Did a tiny bit towards refactoring move gen.