Proposed patches

Here are my two remaining proposed enhancements, rebased against the current master.