Continuing to normalize helper functions.
More functional cleanup.