These are handled about 50-50 between code changes when reasonable, and annotations when not. No source code is changed.
Closes #17