I just pushed out a80bd77 which does this and also changes the next block to a more obvious bare `return` rather than returning a variable which can only be `None`