JANITORIAL: Add FIXME about refactoring cf. #789