This is library code (imported from elsewhere) so I'd prefer not modify it so minimize diffs if we re-sync later.