Move methods to consistent locations.