A commit full of FIXMEs and hardly anything else

By the poetic tone of my commit messages, I presume it is quite clear
that I am very sleepy, which is why not a single of these FIXMEs have
been attended to today. Hopefully, some day...