ASNN-827
Refactor to remove lazy=false 

git-svn-id: https://source.sakaiproject.org/contrib/assignment2/trunk@85366 fdecad78-55fc-0310-b1b2-d7d25cf747c9