Separate key computation from bundling.