Fix increment and decrement usage with schemata
Merge pull request #2647 from qjroberts/increment-schemata-fix

Fix increment and decrement usage with schemata