As with below, it would be nice to have tests for these changes.