Minor 1.1 refactorings and tweaks
Brought to you by:
philrealtime
Originally created by: philzoio...@googlemail.com
Originally owned by: philzoio...@googlemail.com
Catch-all for minor 1.1 refactorings and tweaks