Perhaps. Should I do that in this PR?