Remove deprecated Perl syntax that was causing warnings and add to the identifier matching regex to allow identifiers with spaces