Works. This slightly improves previous versions.