No more typedefs. Fixes #144.
lint
merge conflict