Commonalize more houdini related code