amnesia: make return values more consistent