Minor style and performance changes.