More fixes for parsing files with comments