Adds fnCall and mixCall support + better isolate behavior w/ comments