Changes I meant to include in #451.