Some cleanup, reduced min/gzipped size by 10%.