DYN: reorganization, so that one data type can use the other

Which means that we need to compile both of them, always.