Fix compiler warnings for shadowed variables.  Make 'conceal' a long instead
of int.
9 files changed