Though that could be done in a separate PR.