Convert top-level methods and properties to use _add_property/method