Small changes, in prep for bigger ones.