Rollup of patches from the last 6 months

Multiple changes from @catch22 and a tweak from @gwelymernans. Most of these are (long overdue) internal cleanups.