Some more subcategorizing of functions and stuff.