More cleanup in destructuring.