Improve Util.define_scope: support all valid find options