Rework airflow elements slightly

This fixes the data type problem for airflow elements. If this
works, it'll need to be done with control elements.