WINDUP-171 TYPE_PROP

This line has a bug... the last characters are ", ", but this only removes the " "... so the result ends up with an ugly trailing comma.