Apparently people launch HijackActivity directly sometimes
This makes me sad :(
Miscellaneous small cleanup