Soften todo after compareAndSet fix to Stack impl.
Cleanup and add todos