Adjusted regexp to fix a few error cases; removed quoting from pc_append as it's not necessary, and broke things in general