Remove a couple unnecessary abstractions.