Missing cases with string args; some more code golfing; cosmetic changes; README updated