Updated with Ruf's style cop fixes.