Making more things into functions.