Make AsideUsageKey and AsideDefinitionKey into UsageKeys and DefinitionKeys.

Easy for me to ask now - but why were these keys originally *not* derived from DefinitionKey and UsageKey?