improved extraction to treat operations as top level