Refactor #9939: multiple event functions separated by comma

Also made some indent corrections to eForm with separate commits