[@ADamnFiddle]
Make the last round of edits I said to do in PMs.