DinoDex 9/8/2014

this and line 76 (and probably other places in the codebase) can be compressed to a one-liner