Get rid of abstractions that aren't really needed.

Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>