Removing more unnecessary buffer checks.