Update CHANGELOG for #399. Refactor to prefer a single expression over early-return.