Added some codestyle-induced fixes.