Minor lingering changes, mostly to hspell scraping