Lots of cleanup and new Innodb::System class