jacket-28
Some refactaring to prepare for codegen