Slightly improve prep-less target detection and properly look-ahead for prepositions when finding nouns.