Fix dumb stuff 2.0

This time, without leaving code behind.