PDB-234 Cleanup some minor code duplication and missing versions from case

Signed-off-by: Ken Barber <ken@bob.sh>