Fixed small copy & paste error in the "foreach" defines and added additional defines...