0.5.4, reduce extra parsing