Replacing defstruct-based statement structure with a custom one based on a hash table