The amount of shell in non-shell files was making me uncomfortable, and two of these previously contained awkward `''$` escapes. Apart from forcing one more step to run locally, this is just moving code around.
