Minor fixes to declarative event code.