rp: Clean up command line interface.