Oops, I had an old copy of the git tree (proxy was broken). After a fresh pull I see the missing-return problems were already fixed. Sorry about that, ignore those changes.