Cleanup. Starting work on variable reference counting
Merge branch 'develop' of https://github.com/crsx/crsx into develop