Updated 4.0-specific code to match the destructuring changes introduced in 1.1.