Reduce scope of suppressions in Abstract*Future classes, and make the classes look slightly more similar to one another.

Reduce scope of suppressions in Abstract*Future classes, and make the classes look slightly more similar to one another. #4386