Finish flatten short circuit substitution wrapper, remove hash_table no assignment operator bug