Introducing ciutil/citraits.h. Some minor cleanup included.