Refactor to not use void*
Merge pull request #508 from dymk/aa-default

Use Hashtable* instead of void* in a few places