don't concat around ending conditional comments; cleanup