While this generally looks fine, a more descriptive changeset comment would be helpful! Also, you deleted a number of ways then re-created them, making it harder to understand the history -- please try not to do that. In any case, thanks for making the updates!