Further rewrites, including taking out of all _Error handlers and correcting handling of multiple args