Enum extension + some other scraping fixes

Or rather, it looks like the `raises KeyError` got moved, so either move this comment or dedent it to the same level