Of course as soon as I push it up and review it I find all the junk i
left in. Here's a cleaner patch, with apologies.