COMP: BRAINSTools changes for attempting to resolve build warnings.