Bug 11864: (code cleanup) re-indent parcel.tt and rename a variable