Base: Improve support for forms without presentations