CR: One less exception.