Added missing free variables cases for HOAS