Superficial tidying.
Simple optimisations yielding a performance boost.
Tidying up mess from previous commit.
Merge in simple optimisations from 'master'.