Remove unused dependency on xmlm
Rename substitution constructors
Update .ocp-indent