Reformat, add substitute support.