Add latched variable support to <if/>