Add more options, fix detection of operators with semicolons