Downgrade a TODO to a maybe-this-would-be-nice