Improved dependency normalization