Fixes to our hi/lojack logic

This doesn't actually fix the prompt-eating bug, but it sure looks like
it ought to, doesn't it?