Fix:
     - extract
     - cleanup
Source commands.subr.