Handle more cases and add tests for style normalization.