Use "empty" objects instead of None to simplify error handling in cleanup
Handle remainder after "ommitted" sign. Also convert tabs to spaces