comment out non-standard use of enums pending rewrite with #defines :(