cleaning things a bit, see #1734