oops, that reminds me I should fix the FIXME :)
All the ones I enabled are in this form, I will check if there are other not conforming