Missing some defs for list in compset, unsure where it should go (probably HOL)
Merge remote-tracking branch 'origin/master' into fmap_refactor
Remove calls to translate now gone bind and merge