Swap hook subscribers for Closures/Anonymous functions etc

Easier to read

Change-Id: Id97355a80476cb876a3a22bd0412436772c24be6
Merge "Swap hook subscribers for Closures/Anonymous functions etc"