Missed the extra comma this introduces; looking at alternate approaches. This reverts commit 58cd45ae.