Minor fixes
Modify airflow and control node elements

The old way of dealing with the datatype field was not so
great. The new way still involves strings, but I hope it
is less prone to errors. The data type is no longer a
field, but is a function that returns the right thing.