Use destructuring to clean up use of bounds and state hashes.