Dart template macro cleanup and new return type macro.