Simplify space rules and adjust compiler to new token rules.