@ethomson: declared but not used anywhere. Can you double-check?