issue #20044: Fixes found during vows testing.
issue #20044: More fixes.
issue #20044: More fixes so vows passes.