Increase the variations on definition matching

Covers a few more variations here, will one day integrate Tern to better
handle this.