Removed redundant 'limbo' state from either.
Minor improvements to maybe module.