Gen I: More correct accuracy checking.

- Also several other move changes to prepare for additional fixes.