Remove more unnecessary buildmessage.captures

Part of #3003.