Refactored completion into a single extend() call.