Bugfixes to compression

- Revert change to map of terms
- Accept constant state variables