Fix redex for identifiers with spaces (please check carefully before merging)