Actually, if we're going to refactor this stuff anyway then there's no need to make any change here yet.