Fix typo in wfDeprecated usage Fix some more unreachable code
Hope I did this in an ok fashion. svn merge --re-integrate was giving me issues so I just essentially over-wrote my working copy with the version at img_metadata.