Fix trailing comma, and trailing references to wp2ghost