Here's a proposal to fix #2 and #3: http://www.leonerd.org.uk/hacks/fixterms/