Much more comments.  Support short-variant homed keys