Restore exposing a symbol when it's available. Refs #351
Merge pull request #373 from alex/restore-symbol

Restore exposing a symbol when it's available. Refs #351
merge origin/master
Switch to long for these stand-in constants as suggested by reaperhulk to avoid compiler warnings
fix bogus merge