Refactor more code to adhere to a stricter set of warnings#439

VivekPanyam wants to merge 2 commits intomasteruber/neuropod:masterfrom

more_cc_warningsuber/neuropod:more_cc_warningsCopy head branch name to clipboard