Fixed handling of dummies by language, and fixed handling of whitespace