We may want to be consistent in the messages, like *always* use 'TODO:' so it's easier to grep later.