Clean up: Add extra type safety and squelch a few compiler complaints
in upcoming patches.
Signed-off-by: NChuck Lever <chuck.lever@oracle.com>
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>