No Ticket: tidied up redundancy from my last commit *sigh*