Core: Some structure updates and rewrites.