Resolves Issue #59: Add missing @NonBinding annotations