Ditch dependency on commons-lang3