Get rig of the pesky hashtable lookup entirely