More cleanup, and revert empty struct skipping