Normalize on way out and in