Did that first but that ended up with multiple returns statements - I am fine with that, but I had the idea most uPy sources didn't use it. Checked again though, and I was wrong, it's used in multiple places..