Enhancements

Pave the road for the new lookahead type that dows not use checkpoints, plus some other minor improvements.