systemd-cron: regression: cron-mail should be dynamically instantiated ( %i )

tchet@brix ~/git/systemd-cron $ systemctl cat cron-melanie-melanie-0.service 
# /run/systemd/generator/cron-melanie-melanie-0.service
[Unit]
Description=[Cron] "17-42/5 * * * * true"
Documentation=man:systemd-crontab-generator(8)
SourcePath=/var/spool/cron/crontabs/melanie
OnFailure=cron-mail@cron\x2dmelanie\x2dmelanie\x2d0.service
OnSuccess=cron-mail@cron\x2dmelanie\x2dmelanie\x2d0\x20nonempty.service
Requires=systemd-user-sessions.service
RequiresMountsFor=/home/melanie

[Service]
Type=oneshot
IgnoreSIGPIPE=false
KillMode=process
ExecStart=/usr/bin/true
User=melanie
tchet@brix ~/git/systemd-cron $ crontab --version
2.1.0-1

tchet@antec:~$ systemctl cat cron-daily-apt-cacher-ng.service 
# /run/systemd/generator/cron-daily-apt-cacher-ng.service
[Unit]
Description=[Cron] "/etc/cron.daily/apt-cacher-ng"
Documentation=man:systemd-crontab-generator(8)
SourcePath=/etc/cron.daily/apt-cacher-ng
OnFailure=cron-failure@%i.service

[Service]
Type=oneshot
IgnoreSIGPIPE=false
KillMode=process
ExecStart=/etc/cron.daily/apt-cacher-ng
User=root
tchet@antec:~$ crontab --version
2.0.2-1

Invalid unit name "cron-melanie-melanie-0 nonempty" escaped as "cron-melanie-melanie-0\x20nonempty" (maybe you should use systemd-escape?).
Unit cron-melanie-melanie-0\x20nonempty.service could not be found.
Invalid unit name "cron-melanie-melanie-0 nonempty" escaped as "cron-melanie-melanie-0\x20nonempty" (maybe you should use systemd-escape?).
-- No entries --