Move some code around.