Handle these in a new PR.