Revert moving db_gencode (sensible to leave under adv options).

This reverts commit 521131fc1d55670467a88117591b2594e5a43cc5.

That change also should have remove the adv_opts prefix, as it
was it broke things :(
Fix XML in new macro