The whole thing now seems to be needed to replaced by this less clear, more bulky piece of code now.
