Pull the block after the if-else in the end of what used to be do-while
body into all branches there.  We are almost done with the massage...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>