More work on abstraction.