Simplify more, another huge speedup

benchmark              old ns/op    new ns/op    delta
BenchmarkMake             536759       106729  -80.12%
BenchmarkMakeEncode      2842601      2293176  -19.33%
BenchmarkMakeSVG           29835        27740   -7.02%