Style guide PR tweaks.