Optimize further by not using the normalized_* methods