Forgot cvs commands, so only the surrounding changes made it... sigh.