Clean up validateBaseCapabilities() a bit