Fix the build after recent DIBuilder changes and try another approach to
handling derived subroutine types while there.