2014-05-03-19.49.09: Still more xkit tidying.