A bunch of possible optimizations

Stephen Drequested to merge
gh-f8957898/2/unknown/opt into master

Created by: dotdash

Not a proper pull request, but more of an assortion of ideas.

Merge request reports