Fix style issues in lib/.

This diff is best viewed without space differences.