Silence warning in GHC 7.6

...while still remaining compatible with 7.4
Fix trailing comma ugliness