Fix bad assumptions about types. PR:		1649 Reviewed by:	phk Submitted by:	Jason Thorpe <thorpej@nas.nasa.gov>
Fix bad assumptions about types.
PR:		1649
Reviewed by:	phk
Submitted by:	Jason Thorpe <thorpej@nas.nasa.gov>

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase