Moved some code out of the way.