osc: Some minor cleanup.