Removed unnecessary checks in util/discovery.
Added markup method to schemaform form.