Oops. Remove FIXME keywords, which were used by me as a reminder to fix the lines properly, while I was in the process of deprecating other delegator methods.