Named constant for null component handle
Removed getVAOID
Iterator fixup
Removed unneeded if/else
Added asserts