Simplify the expand function.
Remove useless NVPObject.assign() function.