Various cleanups
While working on !138 (merged) I stumbled upon various issues that I'd like to resolve in a separate MR to reduce the size of the original one.
While working on !138 (merged) I stumbled upon various issues that I'd like to resolve in a separate MR to reduce the size of the original one.