This is just a housekeeping pull request to silence compiler warnings and make bolts build cleanly for iOS on Xcode 12.