Fix concat being inserted into typedefs
Merge branch 'working'