Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev