Refactor normalization from anonymous functions to class methods.

This reduces complexity.