slight reorg of the vagrant definitions