Merge pull request #1760 from rohit-n/shadow DSPLLE: Silence -Wshadow warning and conform more to style.