This is just the for-RC fix. A 'TODO' command is added, describing what's needed for the more-complete fix.