Minor rearranging

Don't declare/override what you don't need to; put methods in the same
order as the core behavior (easier for side by side comparison)