Fix #14578 by checking isCompoundHsType in more places