A few post-merge cleanup items
Some callback handler helper utilities
[ELY-43] Switch from ByteArrayIterator to ByteArrayInputStream