Style/consistency fixes.