Fix functions using feat_defn with use of struct