Now writing partial Definition.inline files, and major cleanup