Here is an updated patch with the following changes: * Fix curly braces to follow GNU coding conventions * Use 'scm_hash_create_handle_x' and friends to reduce hash table lookups. - Dave