Minor fixes to avoid gcc8 warnings
Cherry-picked from !1225 (merged)
9108ab22 Minor fixes to avoid gcc8 warnings
aa56c81a Remove const qualifier on typedef
51b73bed More return cleanups
Cherry-picked from !1225 (merged)
9108ab22 Minor fixes to avoid gcc8 warnings
aa56c81a Remove const qualifier on typedef
51b73bed More return cleanups