Moved stuff around in 51b78fe.