Revert "Avoid lonely underscores at the corners"

This reverts commit 96810bbaa4f7c3f6c372d3d21be79ea9f6d680ff.