After the previous changes, func_normalize() turned out to be redundant.

This simplified some other places in the code.