Slight optimization/simplification.