Fix injection of locals for 'resolve' functions (see #31)