I agree we should. Would prefer to put it in a separate PR though.