This was, again pulled in from @Amerdrix's changes, and in this instance I disagree (but didn't change yet).