Fix problem with macro arguments which are not separated by whitespace

fixes #7314