Fix ugly hack to at least be consistent with itself

Let's not have the hack even more ugly by using slightly different
commands to do the same thing in different places.