House cleaning after a bit of a break.
Generalizing things based on dougkoellmer.com