Get rid of many calls to doOrDie/doOrThrow

The things they wrap no longer make buildmessages.