These patches modify the indentation implementation to use `<p