Bug fixes and introduced TOUCH.
Removed ad-hoc ensure/compute pairs with new MAKE facility.