Done for smoke functions. Smoke modifier functions seems an oddballs here, but probably also to be renamed.