Follow up on changepic review

See remaining comments in #2743