#28 Small refactoring of grammar rules for "last-" and "next-" weekdays