Primarily go style issues; also a TODO that really exponential backoff is the correct policy for API call retries.