Fix some more shift/reduce conflicts

refs #7800
Remove debug code

refs #7800