Use uppercase macros
Use undefined instead of not_found for hash table lookups