Further work toward accepting more than .s, .c, and .cpp