Fix: E731 do not assign a lambda expression, use a def I just marked the lambdas with noqa. Fix also other problems found by hacking in files changed. Change-Id: I4e47670f5a96e61fba617e4cb9478958f7089711