(PDB-204) Simplify variable destructuring and other minor cleanups