Fix if-bang tokenizer.  Update test.