Fixups and workaround around Hoe, plus a note that this isn't ready for prime-time.