Minor cleanup to conform to the new plugin API.