Oops, these should have been in the last commit.