Simplify notification handling.

Change-Id: I998cf152b350a5da040f021ff14ae426111e4e8f