Slight simplification to liveness loop.  Some TODOs.