Maintain consistent spacing with upstream code