Issue by clarticus: added additional curly braces around tables where they were missing for functions that were missed to more fully support prefixed table installations.