Build #39:   Bugfix optional type argument and clean up code Bug was introduced in d94d594 on branch MOODLE_310_STABLE over 4 years ago