CRM_Core_SelectValues - Fix bad code / warnings which break test