Minor improvements to call handling logic.