Refactor the descriptor code for Ray-V to align with the coding style
elsewhere...