Branch: move around a few things.