replace lambda "no-op" with a call to functools.partial that will handle this better