Fix some more has_key() uses. This could really use a tool to automate...