Use hpp-util kitelab macros to prevent -pedantic warnings.
Fix warning: return type.