@WalterBright Is there a better way to detect these?  Are there other ops I should be checking for?