Ion-defs

Fixes another paramdict-raw conflict and updates r2demo.yml with CEI
changes.