Please don't bikeshed this with requirements to fix problems that are there now anyways. This is the simplest patch to fix an obvious problem, it doesn't fix all the other problems.
I should have merged this months ago, but people keep wanting a superpatch to fix everything. Dave.
