Merge "Even more out-factoring to methods in the header"