Remove silly function abstractions.