puns are not funny; type punning especially so

clean up some warnings from merge