Added the explicit normalization types/behaviour again.