Cleanup and changelog entry for new contextfunction behavior