A couple minor code changes to be more idiomatic based on kibit static analysis.