Fix: Various recommendations by scrutinizer.