ensure we check for blacklist eval in more spots
slight tidying