More maintenance on apigee.el.