Clean up child key parsing logic