Updates based on @JonRowe's PR feedback.