2014-05-03-18.12.10: More xkit tidying.