Added rewrite of eos(_) to None().