add trailing comma,
fix bad merge (from 2.5 years ago?)
remove the extra C that snuck in

accidentally added in d15d5e045bd2004b503a3bc975287082ac1a1500
include missed test
put correct licence headers back