cleanup to HList and some new tactic stuff imported from MirrorShard.