Fixed up some function signatures that were still using session.