Restore quotes around boundary definitions