Misc. lightform fixes/refactoring; make sure allowed/no_subcontent fields are removed