finished conversion to bounded. fixed or suppressed all warnings, as appropriate.