Fix assignment of vehicle IDs in BlockDescriptors; format comments.