This changes the visibility of some methods, removes unnecessary
abstractions and fixes static import of GroupId constant.