Attempt to streamline swig definitions