fixed a bug related to determining an expectation's indentation/prefx
improvements for token-based diffing
improved whitespace