Coo, PRs 16940, 18108 and 20482 in one shot. Grouse shooting has nothing on this! Thanks for clearing the bug reports, gentlemen. Paul T