KNL-1045 More improvements to the events to statements converter



git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@123448 66ffb92e-73f9-0310-93c1-f5514f145a0a