Complete support for annotated types, with tests (and fixes for bugs that slipped in the previous commit due to lack of tests).
diff --git a/include/fruit/macro.h b/include/fruit/macro.h
index ef2bbb8..849da10 100644
--- a/include/fruit/macro.h
+++ b/include/fruit/macro.h
@@ -89,7 +89,7 @@
 private: \
 template <typename FruitAssistedDeclarationParam> \
 using FruitAssistedTypedef = FruitAssistedDeclarationParam; \
-template <typename FruitAnnotatedDeclarationParam> \
+template <typename Annotation, typename FruitAnnotatedDeclarationParam> \
 using FruitAnnotatedTypedef = FruitAnnotatedDeclarationParam; \
 public: \
 Signature