Minor tweaks to simplify class resolution.