I've looked into it and it doesn't seem to me that the code will get simpler.  I may be missing something though.