Various source cleanup, better flex argument type interpreter