Minor tweaks to debugging commands.