Move a couple of code blocks around.