Slight improvements to the (still mostly ugly) authorization interface.