Grundlefleck: minor tidy-up and method reshuffling.