Minor performance optimisations
Merge remote-tracking branch 'camspiers/minor-perf-enhancements'

* camspiers/minor-perf-enhancements:
  Minor performance optimisations