A bit of stylistic cleanup (chose the wrong side during conflict resolution).