Closing this as per previous discussion with David Ffrench that this will not be done as part of current refactor.