#325 style nits.