Thanks, you're entirely correct. Sloppy code - was copying/pasting from a previous version of this in my head. Fixing both.