Removed some dead code, factored out two redundant atom internings.