Switch to batch method that doesn't require a filter

Instead of using izip_longest instead use a slice batch method so we can avoid
an extra filter of None values.