Refactor: functions -> methods
Fix #1268 "A submission with echo: expires the session"