[cal10n-dev] Better annotations?