Postponing further changes for now, too risky before release when unexpected cases can cause eternal loop.