Follow-ups to #848.