More final style fixes.