Undid inlining of some functions, since they were actually used in
another place.