Slight tidy-up

Fix a FIXME accidentally left in my last pull request, and remove #defines of stdbool constants.