More atom-type cleanup; get Ubigraph to build

Fix build break