Style and lint fixes.