Making `@on` available more widely on the client (#51)