Push BangType down into Type. Groundwork for #11.