Fixes for proper has_key checking, part 2