Struct cleanup

Removes a couple of TODOs from the struct code.