Minify recent style changes.
Bring in latest from HC 2.0 branch.