Housekeeping.
Some more housekeeping and a bit of recipe tweakery.