Implement more robust unit normalization