Worked around staggered dslashParam scoping issue, and some small clean up.