Added an XXX comment as this seems easier for now, and the refactoring can take care of tidying the code.