Addresses issue #3418 (closed). I have a clean build running, and still need to test real-life usage.