BTW, your proposal means that we might want to move Kind into a top level class.

Yes, it should be a top-level type.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira