Also clean up construction of STRONG_TYPEDEF so that it can be packed properly in structs (this explains all the () -> {}) changes here.