More clean-up for issue #3