Fix for handling of zero-length declaration blocks
Improved handling of stdin streams