Helper stuff is a bit more neat now.