Move some methods around.