Merge "Move internal helpers to the class that uses them"