Merge 83060d5 into 1c6046d

src/include/darma/impl/collective/collective_fwd.h

@@ -57,11 +57,14 @@ struct op_not_given { };
 // TODO move these to interface files!
 #include <darma/keyword_arguments/macros.h>
 
-DeclareDarmaTypeTransparentKeyword(collectives, input);
-DeclareDarmaTypeTransparentKeyword(collectives, output);
-DeclareDarmaTypeTransparentKeyword(collectives, in_out);
-DeclareDarmaTypeTransparentKeyword(collectives, piece);
-DeclareDarmaTypeTransparentKeyword(collectives, n_pieces);
-DeclareDarmaTypeTransparentKeyword(collectives, tag);
+#include <darma/interface/app/keyword_arguments/input.h>
+#include <darma/interface/app/keyword_arguments/output.h>
+#include <darma/interface/app/keyword_arguments/in_out.h>
+#include <darma/interface/app/keyword_arguments/tag.h>
+
+// Deprecated:
+#include <darma/interface/app/keyword_arguments/piece.h>
+#include <darma/interface/app/keyword_arguments/n_pieces.h>
+
 
 #endif //DARMAFRONTEND_COLLECTIVE_FWD_H

src/include/darma/impl/commutative_access.h

@@ -52,16 +52,15 @@
 #include <darma/impl/commutative_access_fwd.h>
 
 #include <darma/impl/meta/detection.h> // nonesuch
+#include <darma/app/interface/keyword_arguments/to_handle.h>
+#include <darma/app/interface/keyword_arguments/to_collection.h>
 #include <darma/keyword_arguments/macros.h>
 #include <darma/keyword_arguments/parse.h>
 #include <darma/impl/handle.h> // is_access_handle
 #include "flow_handling.h"
 #include "use.h"
 
 
-DeclareDarmaTypeTransparentKeyword(commutative_access, to_handle);
-DeclareDarmaTypeTransparentKeyword(commutative_access, to_collection);
-
 namespace darma_runtime {
 
 namespace detail {