AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>)