Amended @ediosyncratic's nitpicks.