Move last remaining freestanding bits of passport assemblage into the bulk.