Fix for CanonicalNamespace hook

Patch 51b934ef6c94eaad60f7e31576ccc1d804eaf04c broke namespace
declaration hook handlers. Fixing.

Change-Id: I6e1fe2321eac7bd8c7721cd86ff3e38a1e84a866