Change hook structure a smidge.