Use t.w.static.Data where appropriate.
pyflakes cleanups.
Merge pull request #1 from tomprince/minor-cleanups

Minor cleanups