Small nits from https://github.com/google/skicka/pull/11