Made the element parsing a little prettier.
Merge branch 'wormtable-transition' of github.com:jeromekelleher/wormtable into wormtable-transition