Simplifying code

Thanks to review from http://ikiwiki.info/todo/calendar_autocreate/