Pull stuff out of opt namespace