Fair. Would you like me to add a FIXME comment?

The other review items you pointed out have been addressed in the latest commit.