I assume this is not part of this PR but a catch on unneded markup here, right?