Return codes have (I hope) final shape.