2013-09-02-15.31.22: More tidying of typestuff.