Remove unnecessary consts from integer return types to avoid icc warnings

This MR removes unnecessary consts from integer return types to avoid many, many warnings from the Intel compiler.