Simplified notation parsing and other cosmetic fixes