Use get_klasses for more things

Otherwise we'd have to add another exception for 'address_record'.
Merge pull request #556 from drkitty/fix-deletion

Fix deletion