Adapt to allow for inc optimizations (no semantic differences)