Image loading tweaks

Christopher Davisrequested to merge
wip/cdavis/image-loading-tweaks into main

Small tweaks that make the code a tad bit nicer.

Merge request reports