Adapted to latest developments in common.