Should fix gcc 4.6 issues and keep code readable

commit https://github.com/tufty/tmk_keyboard/commit/3f2549f839c437f0dac7a53cd4a1e600db4ae5be