Fix: Various code-style issues raised by scrutinizer.