Port normalization to new API.
1 file changed