Further improvments to coverage (now at 87%).