More flexibility when matching the subject

Sometimes it's 'of "foo"' and sometimes it's 'of foo'.