more consistent naming in Constant
Merge branch 'condconst' into baut
now merely_rec_hset needs unfolding