More abstraction

A couple more abstractions.