6435/truncate alert

I don't get why Github reports this as a non-automatic merge. The branch is freshly rebased on master.
I couldn't find a compact way to write this without violating The Zen of Python (Flat is better than nested)