q2: tiny fix to get q2 past the typechecker
builtins: Update lookup to take template parameters that match the generator