More work on the optimizer #19