This fixes an error with a trailing ',' and makes the code easier to extend.