Lint be happy
Rewrote to work with ST3.
Primitive locals support.