Hmm, never mind, reading the code it still seems cleaner to keep it where it is.