Bounded completion is back, also code cleanup