Make more argument types, move stuff around.